Merge xen-ia64-unstable.hg
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 2 Mar 2006 09:49:19 +0000 (10:49 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 2 Mar 2006 09:49:19 +0000 (10:49 +0100)

Trivial merge